Merge "[Media] Simplify how we get the background color for the media player."...

Merge "[Media] Simplify how we get the background color for the media player." into tm-dev am: 0943028d

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



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