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

Change-Id: I011952772f9b50b25e07fcc765be691b974c9076