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

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

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



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