[automerger skipped] NR advanced state check for NR SA am: 523a7109 -s ours...

[automerger skipped] NR advanced state check for NR SA am: 523a7109 -s ours am: d0f9e8d6 -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: I225d52b0e6941782c27d62221c625480d48fa9bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>