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

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



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