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