[automerger skipped] Merge "Add a verification flow for the user to exit repair mode" into udc-qpr-dev am: 5a075690 am: 95c6e720 -s ours

am skip reason: Merged-In I51699d157e9de1a57bc36797ea005bcdd51aadb3 with SHA-1 5ebbd7d3 is already in history

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



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