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

Change-Id: Ic6783d55ba6e6a4009569952b542b2a5a42501fe