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: 4d771c5c am: a52091af

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



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