Merge "Controls UI - Fix icon tint for custom icons" into rvc-dev am: 2020f93a13 am: 720f686fe3 am: fd844443cd

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

Change-Id: I095d2d7b52c4f9d5f8fde75a4c89ebaaef2b7064

packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt

@@ -413,7 +413,9 @@ class ControlViewHolder(
 
         control?.getCustomIcon()?.let {
             // do not tint custom icons, assume the intended icon color is correct
-            icon.imageTintList = null
+            if (icon.imageTintList != null) {
+                icon.imageTintList = null
+            }
             icon.setImageIcon(it)
         } ?: run {
             if (drawable is StateListDrawable) {