Merge "Cross check CellIdentity w NetworkType in RegState" into tm-dev am:...

Merge "Cross check CellIdentity w NetworkType in RegState" into tm-dev am: ff75ab6c am: b9c5499a am: c8d071fa

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



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