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

[automerger skipped] Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530 am: aa886be6 am: 6be5b869 -s ours am: b6abce56 -s ours

am skip reason: Merged-In Ibf74839f688df587d1f791795924a8152c52e3dc with SHA-1 5153e1b7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2098372



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