[automerger skipped] Merge "NR advanced state check for NR SA" am: 4b8285d6...

[automerger skipped] Merge "NR advanced state check for NR SA" am: 4b8285d6 -s ours am: b386b3fc -s ours am: b8b146f9 -s ours am: 1d705970 -s ours

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

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



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