Merge "Merge "[Unfold animation] Merge change transitions into unfold...

Merge "Merge "[Unfold animation] Merge change transitions into unfold transition" into udc-dev am: 7db57f1d am: 8759844e am: 65545c6d" into udc-qpr-dev-plus-aosp am: a079017c

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



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