[automerger skipped] Merge "Clean up a few names of Telephony intent extra." am: 6bb737c5b9 am: 681bf8a664
am: 37683154b4 -s ours
am skip reason: change_id I5d47b132abb722282bd10b9fbb362fb1f1d32f11 with SHA1 f2fca31c51 is in history

Change-Id: I8d45b26d7863190ddf51a8e8a5e86b4acfbde816