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

Change-Id: Ic0a5b9acedd9ed56aaa189aaf89aaa10f273f019