[automerger skipped] Merge "Deprecate some system apis in TelephonyManager" am: cec2e41d43 am: 701d213e0a
am: 9731aafce1  -s ours

Change-Id: I738163d5633f3387fc43dc0b939805fe46928c6e