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

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



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