[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: 116c333741 -s ours

am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a854 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188

Change-Id: I14bff46034aa0d5d1fda4763b445d2fb55bad83c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>