[automerger skipped] Merge "flag_stop_face_auth_on_display_off is true for this device" into udc-d1-dev am: 5d9b6e24dd
-s ours am: 956d88ef82
-s ours am: 2698236ee6
-s ours
am skip reason: Merged-In I64508ab579319415d2c59629c68f8bc8f44afc40 with SHA-1 b8e712bd4c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24314336
Change-Id: I5e6484f0c955d63b0346f73db274d383d536a199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
64689da33f