Merge "Update battery icon for incompatible charging" into udc-qpr-dev am:...

Merge "Update battery icon for incompatible charging" into udc-qpr-dev am: 8e516c17 am: 51518707

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



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