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

Change-Id: Ic8064420142d961c92e04d606b74b952706c7146