[automerger skipped] Merge "Connect Call Composer Extras for incoming call" am: ba1f6693dc am: febb2a2659 am: 627e2e2ee6 -s ours

am skip reason: Change-Id Ie4b42e164c6203a02657bcac136de1ad1ec0be55 with SHA-1 69c722f884 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1542211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifce4c17364105470633604471bd01d714cf424d0