Merge "[Bugfix] avoid deadlock caused by AppBatteryTracker.dump" into main am: 374f09ebb7

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

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