Merge "Include saved battery history chunks into BatteryUsageStats parcel" am: 2f7508a404 am: 587f8cec3d am: 4c21515da7

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

Change-Id: I283453f3391287e7c2d672db178acbdd57fe715f