Merge "Update default activity animation" into udc-qpr-dev am: 010805ee am: 9c4b60e8

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



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