Merge "BatteryStatsService: usage stats query update" into main