[automerger skipped] Merge "Include saved battery history chunks into...

[automerger skipped] Merge "Include saved battery history chunks into BatteryUsageStats parcel" am: 2f7508a4 am: 587f8cec am: 4c21515d am: d012a49d -s ours

am skip reason: Merged-In I369d863b6f6fd488030aa031cc465bef6ce99ab8 with SHA-1 e07408d4 is already in history

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

Change-Id: I794b67233e9714f58f9caa4f4fe87b89715f832e