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

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



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