Merge "MediaPlayer will now transition the background with color scheme" into tm-dev am: 3a2ffd7e

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



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