Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."

Revert submission 23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ

Reason for revert: <b/281883862 is fixed >

Reverted changes: /q/submissionid:23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ

Change-Id: Ic6050d6ae6e720841ce2129880f1f7ed43328185
Merged-In: Ic6050d6ae6e720841ce2129880f1f7ed43328185
(cherry picked from commit b9e55e94)
(cherry picked from commit 986c56a6)
(cherry picked from commit 905c26a8)