Merge "Implement merge animations for AE Shell animation." into udc-dev am:...

Merge "Implement merge animations for AE Shell animation." into udc-dev am: 0b922022 am: 35b393dd am: 2768b5ee am: a405d20f

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



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