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 am: 0c019b42

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



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