Merge "Add call composer Extras for enriched calling" am: a4524a936a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8f600be59e66441764d1e8f4ecb7765b30e1026