[automerger skipped] Merge "expose APIs for mainline telephony-sdk" am: 0bc81e1d23 am: 91c9100315 am: 1fa842bd68 -s ours
am skip reason: Change-Id I943e2a2ca4ac1cb637cc237e580bd5cfca88a516 with SHA-1 8713b167a9 is in history

Change-Id: I0014660627efab09216dddec2ed466a5b941262c