[automerger skipped] Merge "Fix usages of @hide APIs in Telephony from...
[automerger skipped] Merge "Fix usages of @hide APIs in Telephony from Telecom" am: 83878322 am: 1b99428e
am: 1d6ae4cc -s ours
am skip reason: change_id Ib555b44ad2808edb084b54bc2159e933b0576dff with SHA1 dfd0f0f6 is in history
Change-Id: I31b00e8a0e5621b22a0068bb5501b975b2bb0ccb