[automerger skipped] Merge "[DO NOT MERGE] Reset face_unlock_re_enroll value on reboot" into udc-qpr-dev am: da8da319 am: 8619f38a -s ours

am skip reason: Merged-In I8a50c96c2fd45996743daa0361df82883fe165a2 with SHA-1 e167fd0d is already in history

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



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