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

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

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