[automerger skipped] Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for...

[automerger skipped] Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b47 am: ce4f99fd am: d5601885 -s ours

am skip reason: Change-Id Ibd1b0f0bc66487cfdb05d3de46c7e8df74eeb8cc with SHA-1 d24aea31 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefad365dd741bb4f33f68ee2c33fe0177424e44b