Merge "Add Call Composer Carrier Config keys" am: 4260bc4f95 am: a1106b08fa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id284c446b1a39a3a208ab99037554081f70a8c9e