[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 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: I0b5fe9de55e71422abb8f82fb6ca85c5d627b123