[automerger skipped] Merge "Make NR state/frequency checks consistent" am:...

[automerger skipped] Merge "Make NR state/frequency checks consistent" am: bfc0e33b am: 17a2b504 -s ours am: b92ff717 -s ours am: 8aedda18 -s ours

am skip reason: Merged-In Ib416dcd7a3b68fcb2dc54309f819eddf962b35e7 with SHA-1 4a33e21b is already in history

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



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