Merge "WifiManager: Remove sync version of getWifiActivityEnergyInfo"