Merge "Clean up a few names of Telephony intent extra." am: 63bf486921
am: 2cadf8e9f9

Change-Id: I1026c87f73abc5dccee6c1b5a1747c53e436b5f0