Merge "Remove SocketUtils from incompatibilities" am: 19eac68feb am: e821cb86de am: 7cede20cad

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1662280

Change-Id: I26c3ca50276a835c12abc453bdedd71f9bfd3c7e