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

Change-Id: I967ff804d2dabea9215478d742d7968754c060bc