Merge "Migrate cts/tests/tests/net to androidx.test"
am: c4c0bb37cf

Change-Id: Ib5232e086acbf6ffbcb5c0e7cb4b1e73cd778a85