Merge "Update aod face-auth transition" into tm-d1-dev am: c18067d4 am: c37bda27 am: a517425e

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



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