Merge "Update status bar battery icon" into udc-dev am: 6f39b5f9

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



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