[automerger skipped] Merge "RESTRICT AUTOMERGE Don't run faceDetect when fp is locked out" into tm-qpr-dev am: aa009e2196 am: 5dcff962ae -s ours am: f6c3b6fe73 -s ours

am skip reason: subject contains skip directive

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

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