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

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

Change-Id: I992072532c1aaf0f28e310eb4a3301a0edce2d0f