Merge "Fix tint of battery icon" into udc-qpr-dev am: 8a907427 am: d74ddbd6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842149



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