Merge "[Device Controls] For custom icons, keep the tint the icon comes with."...

Merge "[Device Controls] For custom icons, keep the tint the icon comes with." into sc-dev am: 48f51861 am: dfaf5e63 am: 42e40cc9

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

Change-Id: Icf3157b4b55bf4d79b62478a5589a730c51d583e