Merge "Add Call Composer API extras in TelecomManager" am: 6e419a49a7 am: 9a1365f43d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535166

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5539c70ff4019ed4c841155a8ad8bc029bd39344