Merge "Remove SocketUtils from incompatibilities" am: 19eac68feb

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

Change-Id: I06f788fc45304bf822511832d3eb017a7818b824