Merge "Migrate frameworks/base/tests/net/ to androidx.test" am: 58038da960
am: dc1077d5db

Change-Id: I88b55d65728e366e2ffd1336e28da4a879b2d5a2