Merge changes from topic "cherrypicker-L35000000962971612:N04200001403494768" into android13-tests-dev

* changes:
  Move libcore.java.net.SocketTest to JUnit4
  Skip SocketTest#testSocketTestAllAddresses