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: I171cefd74356c95209660e933d0e3a5cb56b5bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>