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

[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff5 -s ours am: 2058e088 -s ours am: 8e3b54f8 -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: I0a7f8bea05ef93af5f60471df19143755208941f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>