Merge "BatteryStats: Fix read/write parcel order" into nyc-dev