[automerger skipped] Merge "Replace Telephony internal API's usage with a...
[automerger skipped] Merge "Replace Telephony internal API's usage with a public API" am: 1f436377 am: 903b7bae am: c0e7ff10 -s ours
am skip reason: Change-Id I3131befa4abe0e2548bf295f7a8f5cd6926c8cc1 with SHA-1 e0b7831c is in history
Change-Id: Iea2bbd3e73b13268d1a79adf18056d3d07614e88