am a10cc893: Merge "Revert "Telephony: Register/Unregister Phones with CallManager""

* commit 'a10cc893f7e1f21783ea60c50a49401181611027':
  Revert "Telephony: Register/Unregister Phones with CallManager"