[automerger skipped] Merge "Make registrationState consistent with RoamType in...

[automerger skipped] Merge "Make registrationState consistent with RoamType in case of override" am: 6890fa9e am: 550e6475 am: 0c62d855 -s ours am: cac163b2 -s ours am: d5d65e8d -s ours

am skip reason: Merged-In I7d140566e2d17d07440e7042307774ff951befcb with SHA-1 f9225419 is already in history

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



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