Merge "[BatteryStatsService] Disable deprecated BatteryUsageStatsAtom" into main