[automerger skipped] Merge "Export BatteryStats info to Atrace." into...

[automerger skipped] Merge "Export BatteryStats info to Atrace." into tm-qpr-dev am: 745d055d am: e92778a6 -s ours

am skip reason: Merged-In Iaae4e9796a44be3ffdaee31b956bbb3e87735ead with SHA-1 f3f3f517 is already in history

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



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