Merge "Do not run device entry face auth when keyguard is not showing ...

Merge "Do not run device entry face auth when keyguard is not showing                                                                                                                                                                    Other changes:  - Reduce hardware error retry count to 5 (unresolved comment in another CL)" into udc-qpr-dev am: 5c5d1ab9

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



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