[automerger skipped] Merge "[Telephony Mainline] Use new method for mainline" am: cb04f43c9c am: 10f77eff19 am: 62008cf929 -s ours
am skip reason: Change-Id I9998906fa258632bb4e780fae80aa5bf89d28226 with SHA-1 faa1d7a4de is in history

Change-Id: I4d6a2d0b58108696c2fd56e090963b2a67fe8e5d