Merge "Deprecate redundant IMS APIs in TelephonyManager." am: 8012f3df57
am: 2c8a876fd2

Change-Id: Ic5a4a4fd1fd411da8d88db50564bc3fcd5ee5a9c