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: e96d0d27

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



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