Merge "Make NR state/frequency checks consistent" into tm-dev am: d2cdd697 am: 76978cbc

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



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