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

Change-Id: Id940ff738b08d25a09efd2b624596c75ea90297f