[automerger skipped] Merge "Add carrier config keys for GBA" am: 7715ad3a am: dbc2a426 am: 3ba12c70 -s ours

am skip reason: skip tag Change-Id I03487dca483cd91ddcafe9487f211eb3069caf5f with SHA-1 ab470f72 is already in history

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

Change-Id: I4193037241441ee9b151e9f262b349428083988e