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