[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21585080 Change-Id: Ie7b96f843f4749d57719373f3d80725341a8ee37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: