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

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

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



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