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

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



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