Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." am: a90205492f
am: f0dd39f7d0

Change-Id: I66f4d857e4fb6e683063bb5543a992659f55a06c