[automerger skipped] Merge Android R am: 19f9fc18c9 -s ours am skip reason: Change-Id I4e01fbf5d6fd342573625b6e3ad0c2a387432920 with SHA-1 801d339361 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1421778 Change-Id: I021f4f48a830c1cedcac45f429f8f94660ac6aa9