Merge changes from topic "am-48fce8054ea84f449c45918497754b47" into stage-aosp-master

* changes:
  Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" am: bfd05221
  Merge "Add Call Composer Carrier Config keys" am: 4260bc4f
  Merge "Add call composer Extras for enriched calling" am: a4524a93
  Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b47
  Merge "Add Call Composer API extras in TelecomManager" am: 6e419a49