Merge "[Unfold animation] Merge change transitions into unfold transition" into udc-dev am: 7db57f1d am: d813b3ff

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



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