Merge "Remove updateUsageBatteryStats in dump due to ANR" into main am: 67dcd28a3d

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

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