Merge "Controls - Custom icon/color issues" into rvc-qpr-dev am: 6095954e6d am: c27958d2dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12538364 Change-Id: I3b3050cdda4028c7ce9372236e8e3b32a21ef044
This commit is contained in: