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

[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into udc-dev-plus-aosp am: 631fe7a4 am: 5e95b07c -s ours am: 5b93321a -s ours

am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 986c56a6 is already in history

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



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