Merge "Controls UI - Fix icon tint for custom icons" into rvc-dev am: 2020f93a am: 9a7e815d am: a7004a53 am: 862061c7

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

Change-Id: I3c18d0f4319397426d4ec4b22698688422527607