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

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



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