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

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

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