tree eae93fe06bdd39db8209e0283e401b141a1ee471
parent 73a28754f1eb90f743207305ecb9f627067ee4f6
parent 46a50b35be9612beb92d3a70ff0c8cd2edb53d72
author Treehugger Robot <treehugger-gerrit@google.com> 1595009774 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595009774 +0000

Merge "Remove NR NSA from voice network type" am: 46a50b35be

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

Change-Id: Ic9f0a1b78d4bd5321dbc8ab814246d62d419a563