[automerger skipped] Revert "Revert "Updated AnimatedContentScope to...

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

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

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



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