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

Change-Id: I9f8cbdd345bf6b5c95cab4360d89efb9909b3dfd