[automerger skipped] Merge "Create carrier config for NR enabled setting" am: c8d4118796 am: 30ef91f5b3 -s ours am: baa6bf21f7 -s ours am: 86e6de52d8 -s ours
am skip reason: Change-Id Ib81bb6b1712fcf53723df04f162c50a89c96e04d with SHA-1 39c87c67d8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346922
Change-Id: I9b43251fcbe5b583c3bb16c40e9a179c64e3c2a8
This commit is contained in: