Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530c2 am: aa886be6d0

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

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