[automerger skipped] Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530c2 am: aa886be6d0 am: 6be5b86947 -s ours am: b6abce562d -s ours am: ca6633215b -s ours

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

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

Change-Id: I94edf6eaed30164ec92ba26027db2045dcc523cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ling Ma
2022-05-16 04:04:37 +00:00
committed by Automerger Merge Worker

Diff Content Not Available