[automerger skipped] RESTRICT AUTOMERGE Don't run faceDetect when fp is locked...

[automerger skipped] RESTRICT AUTOMERGE Don't run faceDetect when fp is locked out am: 1a10f037 am: 563ae49e -s ours

am skip reason: subject contains skip directive

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



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