Merge "Merge "NR SA only allow NR Advanced override" into tm-dev am:...

Merge "Merge "NR SA only allow NR Advanced override" into tm-dev am: 1a424090 am: fa9c5ec1" into tm-d1-dev-plus-aosp am: 7ba43be1

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



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