[automerger skipped] Create a verify flag to support verification for entering repair mode am: 008cc90195 am: 0142d3d631 am: 27a3016438 am: 9a65491903 -s ours am: eb0b45795b -s ours

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

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

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