Merge "Show battery percentage in QS header" into udc-dev am: a9ab5cc7 am:...

Merge "Show battery percentage in QS header" into udc-dev am: a9ab5cc7 am: 7bc96de8 am: a12de783

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



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