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

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



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