RESTRICT AUTOMERGE Revert change that would detectFp when FP is locked out

This reverts commit ff09044d12f936bab51ed9e7d33016616ce9e87e in
addition to partially reverting ag/20141372.

Bug: 269574598
Bug: 269774551
Change-Id: Iea66d7782b3365dea827b854783aeddaa5c6699c
3 files changed