Merge "WifiActivityEnergyInfo: clean up API surface"