Merge "Move face auth timeout error handling into a separate method." into...

Merge "Move face auth timeout error handling into a separate method." into tm-qpr-dev am: 7fcef9e6 am: 3a1f3f12

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



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