Merge "Merge "Add Face Scanning anim" into tm-d1-dev am: b7d919b7 am:...

Merge "Merge "Add Face Scanning anim" into tm-d1-dev am: b7d919b7 am: 88287b04" into tm-qpr-dev-plus-aosp am: 6e6bc117

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



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