Merge "Fix tv volume control icon color" into sc-dev am: dff092c085 am: 263319f8bb

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

Change-Id: Idcacc175adf5ad94bdccbfafefd3cadc1fdef40d