[automerger skipped] Merge "Migrate cts/tests/tests/net to androidx.test" am: c4c0bb37cf am: 928821e657
am: debeff9d12 -s ours
am skip reason: change_id If102677e4cdc4361b5d93283c4d6140dc477a94a with SHA1 c626be0dc7 is in history

Change-Id: Ibf13a9d9df20af40d7ffd52d938cfa1cb1e2019a