Merge "Move WifiActivityEnergyInfo to android.os.connectivity"