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

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

Change-Id: I1752fc9f9725702a64730fc2e11020277440c38a