statusMessage was missing before and it should be 'or' instead of 'and'.
Now it's the same as in onCurrentPresenceChanged().
This fixes presence saving in the case that only the presence message
changed.

REVIEW: 105133