Merge "Avoid UI freezing when reading battery capacity/status" am: aaa9f802...

Merge "Avoid UI freezing when reading battery capacity/status" am: aaa9f802 am: 83193e69 am: bc075eb1

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2198903



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