[automerger skipped] Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" am: bfd05221a3 am: 83a86a1830 am: 7269b96458 -s ours

am skip reason: Change-Id Ife05ba75a3f23d0c18b3aa068881b6646dee6db5 with SHA-1 89667c6bb2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a457e4e1984e1f0de15f2b33ab54e327ebe2234