[automerger skipped] Merge "Add carrier config for carrier key" am: 11dff58d...

[automerger skipped] Merge "Add carrier config for carrier key" am: 11dff58d am: b24ba046 am: b5dab857 -s ours

am skip reason: Change-Id I89d88daf2022672bf27125baae0247b75638bb6e with SHA-1 762fe4b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88c0920510bbfe1ad403346f4d615f9f0ce6e020