Merge "Deprecate some system apis in TelephonyManager" am: cec2e41d43
am: 701d213e0a

Change-Id: Ia5a31148450d160109ca67f9ce1b1eed5979d8bd