Merge "Fix tv volume control icon color" into sc-dev am: dff092c0 am: 1f5fe662 am: 3dcea7a9

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

Change-Id: I84c0b0ed3c40b78e26c304c0fb07610703e2e5fb