[automerger skipped] Merge "Add Call Composer Carrier Config keys" am: 4260bc4f95 am: a1106b08fa am: 6d46ef0790 -s ours

am skip reason: Change-Id I12d78f475b947cedb201ff1b379cc64a8f876e62 with SHA-1 136900101b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3f21f0fd5ca84b85c0fb3261d92d88d1776d5ba