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 am: 6367bdb1

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



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