Merge "Revert "Migrate frameworks/opt/net/wifi to androidx.test""