Merge "Add carrier config keys for GBA" am: 7715ad3ac8 am: dbc2a426ba

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

Change-Id: I78f1661d3f18daa5e575b8fe6af2564fb495bcda