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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfe871973a34a9ba6eb0512af8f41f4db363335d