Merge changes from topic "revert_uce_dupe_req" into tm-dev

* changes:
  Revert "Add a new api that does not send PUBLISH request with duplicated presence capabilities"
  Revert "Set mPendingPublicCapabilities to the currently registered service description"