Merge "Make BatteryStatsHistoryIterator API compatible with Iterator"