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

Change-Id: I5cdf50d4c89fd135571d97ab3c4072a6b56bc76c