[automerger skipped] Merge Android U (ab/10368041) am: b027620185 -s ours

am skip reason: Merged-In I1ebe247d494ad7e534edbeff894739e3c37f948a with SHA-1 c2f41048bf is already in history

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

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