Merge "Fix color ration for dark mode for device icon" into udc-dev am: 7d178e50 am: a8a3dd33

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



Change-Id: Ie6aa1e87d7d3c9355dc64675485f0446c23e6e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>