[automerger skipped] Merge "Integrate new boot user flow with auto" into...

[automerger skipped] Merge "Integrate new boot user flow with auto" into udc-dev am: 25126020 am: f60aa384 -s ours

am skip reason: Merged-In I4740fe58bef942e534b6eef24bc5a1ddce270d02 with SHA-1 9768c05c is already in history

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



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