am 0f30a3a8: Renaming Presence and Presence-related columns.

Merge commit '0f30a3a8e8cd6bfba414390e91177b5df2154daf' into eclair-plus-aosp

* commit '0f30a3a8e8cd6bfba414390e91177b5df2154daf':
  Renaming Presence and Presence-related columns.