Merge "Merge "Media transition must crossfade when transitioning to...

Merge "Merge "Media transition must crossfade when transitioning to transparent" into tm-dev am: 8b5e8952" into tm-dev-plus-aosp am: 231a93cf

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



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