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

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

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