Merge "RESTRICT AUTOMERGE Don't run faceDetect when fp is locked out" into tm-qpr-dev am: aa009e21

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



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