Merge "Implement merge animations for AE Shell animation." into udc-dev am: 0b922022 am: 35b393dd am: cc4407c7 am: 6557ae43

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



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