Merge "NR SA only allow NR Advanced override" into tm-dev am: 1a424090 am: 54dcca58

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18083647



Change-Id: Ibc45d57992b27c3e82b92c529b0910862f9b90ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>