[automerger skipped] Merge "Avoid UI freezing when reading battery...

[automerger skipped] Merge "Avoid UI freezing when reading battery capacity/status" am: aaa9f802 am: 83193e69 am: bc075eb1 am: 5d22b76f am: 2bdd091b -s ours

am skip reason: Merged-In Ibb6b8c999b7fd4fe7fbcc57264a1fe6ad74903dc with SHA-1 f9f1a024 is already in history

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



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