Merge "Clean up a few names of Telephony intent extra." am: 6bb737c5b9
am: 681bf8a664

Change-Id: I8576bf49c27620f873c501d3bf837ec0b0b3e679