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

Merge "Merge "Implement merge animations for AE Shell animation." into udc-dev am: 0b922022" into udc-dev-plus-aosp am: c2e436fd am: cdb62a32 am: 28029503

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



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