[automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be
am: df7e42a213
-s ours am: b66acd05db
-s ours am: a2bc9a8afe
-s ours
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930
Change-Id: I6566aee6b5487fa824c09872a8ca04bc9b1a05c9
This commit is contained in: