Merge "Take 2 of Migrate frameworks/opt/net/wifi to androidx.test"