[automerger skipped] Merge "Create carrier config for NR enabled setting" am:...

[automerger skipped] Merge "Create carrier config for NR enabled setting" am: c8d41187 am: 30ef91f5 -s ours am: baa6bf21 -s ours am: 86e6de52 -s ours am: 6fd81a25 -s ours

am skip reason: Change-Id Ib81bb6b1712fcf53723df04f162c50a89c96e04d with SHA-1 39c87c67 is in history

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

Change-Id: If9099f362dc3a9472f0290571158c30dc8b3627e