Merge "Fix initial collection of WifiActivityEnergyInfo" into main