[automerger skipped] Merge "MediaPlayer will now transition the background...

[automerger skipped] Merge "MediaPlayer will now transition the background with color scheme" into tm-dev am: 3a2ffd7e am: 36e0097b -s ours

am skip reason: Merged-In I963afcf4ba0fd8c2e9ebca4d634098f63454fab6 with SHA-1 90a5f092 is already in history

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



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