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: 9ca67eb1

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



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