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

Merge "[Unfold animation] Merge change transitions into unfold transition" into udc-dev am: 7db57f1d am: ed8c1162 am: de000fe8 am: 2c9b1be3

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



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