Merge \\"BatteryStats: Fix read/write parcel order\\" into nyc-dev am: e8a442ccd6
am: 643fc8341a

Change-Id: I094a097c01db63a3af291d3b82b036bef71fd5f6