[automerger skipped] Merge "Remove NR NSA from voice network type" am:...

[automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35 am: df7e42a2 -s ours am: b66acd05 -s ours am: a2bc9a8a -s ours

am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95da is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930

Change-Id: I6566aee6b5487fa824c09872a8ca04bc9b1a05c9