Merge "Reduce size of BatteryUsageStats Parcel" into sc-dev