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

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



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