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 am: 297d6bc3 am: a78f570b

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



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