[automerger skipped] Merge "Add call composer Extras for enriched calling" am:...

[automerger skipped] Merge "Add call composer Extras for enriched calling" am: a4524a93 am: 6b65f686 am: f35776e6 -s ours

am skip reason: Change-Id I2af39eea48737df1bf629caea5b617736635f2aa with SHA-1 36b3dbc3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b941accb7b1d4a0b2f6c3fa4b0768a000c87084