Merge "Avoid UI freezing when reading battery capacity/status" am: aaa9f80247 am: 83193e691d

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

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