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

Merge "Merge "Media transition must crossfade when transitioning to transparent" into tm-dev am: 8b5e8952 am: e771fcf2" into tm-d1-dev-plus-aosp am: 2e7257bd am: 8b1be485

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



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