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

[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into udc-qpr-dev am: 6dd365cf am: 7ad4e648 -s ours

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

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



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