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

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

am skip reason: subject contains skip directive

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



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