[automerger skipped] Merge "Create a verify flag to support verification for...

[automerger skipped] Merge "Create a verify flag to support verification for entering repair mode" into udc-qpr-dev am: 92437274 am: fc397ac0 -s ours

am skip reason: Merged-In I8e22c1c9045c1c67de72fae6e9ed581bb4f04b96 with SHA-1 e7a3e9fa is already in history

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



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