Merge "Fix WifiAcitvityEnergyInfo handling in BatteryStats" into main