Merge "Include saved battery history buffers into BatteryUsageStats parcel"