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

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



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