Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." am: a90205492f am: f0dd39f7d0 am: b706659354
am: 957bb655d2  -s ours

Change-Id: I2c9926aac8938234acdfc96622da55a99bb367fe