Merge "Migrate frameworks/base/tests/net/ to androidx.test"