Merge "expose APIs for mainline telephony-sdk"
am: 0bc81e1d23

Change-Id: I0aff3aabfe041fdd24a7a18389b91a6471d3548c