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

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

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



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