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 am: 8b65c9df

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



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