Merge "Connect Call Composer Extras for incoming call" am: ba1f6693dc am: febb2a2659

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eaccaf1d52790dca2b2ec8d6bb46777105e46fa