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

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



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