[automerger skipped] Merge "NR advanced state check for NR SA" into tm-qpr-dev...

[automerger skipped] Merge "NR advanced state check for NR SA" into tm-qpr-dev am: ff536d15 am: 66715cf4 -s ours

am skip reason: Merged-In I4a16a37233f696e7869427a98b8f385372036bc9 with SHA-1 b3d4478c is already in history

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



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