Revert "Update FocusFinder"

Revert submission 11830696-b/158492287-stage-aosp-rvc-ts-dev

Reason for revert: It's too late to merge this CL to rvc-dev. Let's revert it and merge it to rvc-qpr-dev.
Reverted Changes:
Ib5c1854d1:Update FocusFinder

Change-Id: I5f50166322b662b457e1b79b2ce62c622ddd1013