Merge "Show battery percentage in QS header" into udc-dev am: a9ab5cc786 am: 7bc96de827

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

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