DO NOT MERGE Revert "Fix activity leak bug"

Revert "Fix test cleanup issue in AnimatorLeakTest"

Revert submission 20610032-cherrypick-AnimatorLeak fixes-4lh72bu61o

Reason for revert: Startup regression found in post-submit
Reverted Changes:
Icdd6023f6:Fix activity leak bug
Ieac851550:Fix test cleanup issue in AnimatorLeakTest

This is a tentative revert to see whether it addresses the regression while I continue chasing the underlying problem

Bug: 261518932
Test: presubmit
Change-Id: Ica9a75b94c8c260cceb6719f8f6b95ba67d4e356