Merge "[Telephony Mainline] Use new method for mainline"
am: cb04f43c9c

Change-Id: I7a0978215ec42fb94b7e50b25c603949a22f90f7