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

Merge "Media transition must crossfade when transitioning to transparent" into tm-dev am: 8b5e8952 am: e771fcf2 am: 3bbea73f am: 0b0f6d74

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



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