Merge "Retry face auth whenever there is a hardware error" into udc-dev am:...

Merge "Retry face auth whenever there is a hardware error" into udc-dev am: 0889fb51 am: dcb9363c

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



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