[automerger skipped] Merge "RESTRICT AUTOMERGE Revert change that would...

[automerger skipped] Merge "RESTRICT AUTOMERGE Revert change that would detectFp when FP is locked out" into tm-qpr-dev am: cef1e329 am: c3a1ec95 -s ours am: f3403d41 -s ours am: f15bf9d9 -s ours

am skip reason: subject contains skip directive

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



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