[automerger skipped] Revert^2 "Update face authenticating asset" am: 5d4d6fd220 -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: I5834f70ca128d16ef8828fa52530fbf347711c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>