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

Change-Id: If08d387b21a4e4cb71e7026ca781a472db51e2d1