Merge "Fix media artist color" into rvc-dev am: d516053da9

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

Change-Id: Icc5904a231c93650407bd44b2710b974f1af4330