[automerger skipped] Merge "Copy functionality into calling location from Telephony." am: 6555e726ba am: fa8dc6acdc am: b3e29290c6 -s ours
am skip reason: Change-Id I9722146b05a49aa039385bcc78ff238ace6d369a with SHA-1 4b67ec9308 is in history

Change-Id: I3428dfce4a002625955b249fe1e640239942812c