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: fa9c5ec1 am: 7ebec738 am: 2bd46fa9

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



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