Merge "Update aod face-auth transition" into tm-d1-dev am: c18067d4 am: b7e96832 am: ee892558

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



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