Merge "BatteryStatsService: increase power stats size" into udc-dev