Merge "Update face scanning anim, fix visibility bugs" into tm-d1-dev am:...

Merge "Update face scanning anim, fix visibility bugs" into tm-d1-dev am: 3dcb829b am: 16c1c7be am: 9edeea74

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



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