Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future