[automerger skipped] Merge "Revert^2 "Update face authenticating asset"" into 24D1-dev am: 7608bcd770 -s ours

am skip reason: Merged-In I477ba87ac9fb74a7c1a882d3b6604149931fb438 with SHA-1 3f8c608fcc is already in history

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

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