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

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



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