Merge "Merge "Set default battery percentage in SystemUI" am: 196a3501 am:...

Merge "Merge "Set default battery percentage in SystemUI" am: 196a3501 am: 612e8e5c am: 1f08c15e am: 071ef524" into udc-d1-dev-plus-aosp am: e0d554e4

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



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