[automerger skipped] Merge "Migrate BatteryStats audio calls to oneway" into...

[automerger skipped] Merge "Migrate BatteryStats audio calls to oneway" into 24D1-dev am: 001df5f3 -s ours

am skip reason: Merged-In I7220ad5287b142821ef39d175c3bf88d4a898a43 with SHA-1 364ce02f is already in history

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



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