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: 25dd21df

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



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