[automerger skipped] Merge "Add flags for biometrics animation revamp and face...

[automerger skipped] Merge "Add flags for biometrics animation revamp and face auth refactor" into tm-qpr-dev am: 16afc53f am: 66131b7e -s ours

am skip reason: Merged-In I7c496ac9fdd7482a538001e04ee4469e851e6591 with SHA-1 0a88ab9d is already in history

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



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