Merge "Add carrier config for carrier key" am: 11dff58d5e am: b24ba046ee

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8508d94fe93bca5034259926a7c60a05d6bc2990