Merge "Deprecate some UICC related APIs in TelephonyManager"
am: fdd350b67a

Change-Id: Ia05d89cef17f07d1d7265a4ce43130fe7699b043