[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: I3824d56d65f708b0b7281c1dbe5240564b923e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>