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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fc3863a2b1ded3399a942417a46848b248087b8