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: ed8c1162" into udc-d1-dev-plus-aosp am: 6c772b8b am: 71d77d4d

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



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