Merge "Don't run faceDetect when fp is locked out" into udc-dev am: 757ecb96

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



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