[automerger skipped] RESTRICT AUTOMERGE Revert change that would detectFp when...

[automerger skipped] RESTRICT AUTOMERGE Revert change that would detectFp when FP is locked out am: c447ecea am: 22775459 -s ours am: 3e365ffe -s ours

am skip reason: subject contains skip directive

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



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