[automerger skipped] Add a verification flow for the user to exit repair mode...

[automerger skipped] Add a verification flow for the user to exit repair mode am: 1c95758c am: dc17915c am: 3ae5657e am: 099624aa -s ours am: 7a176cd4 -s ours

am skip reason: Merged-In I51699d157e9de1a57bc36797ea005bcdd51aadb3 with SHA-1 95982a5f is already in history

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



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