Merge "Add flags for biometrics animation revamp and face auth refactor" into...

Merge "Add flags for biometrics animation revamp and face auth refactor" into tm-qpr-dev am: 16afc53f

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



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