Revert "A few fixes for animation takeovers."

Revert submission 30509816-raf-timing

Reason for revert: Likely culprit for b/381006945  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:30509816-raf-timing

Change-Id: If82b674cc4b9b292eefc3859e770b6d7059e9f18