Merge "Fix tv volume control icon color" into sc-dev am: dff092c085 am: 1f5fe66260

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

Change-Id: Ic69911ec283b4bc55570040c954b343adbb3c4fc