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

Change-Id: I1a2232458ab8fd4a89c1ada1e5195bf346e31074