Merge "Move SocketUtils out of the connectivity module" am: 4eb9b18e02 am: b3bc93fbcf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb9911ad2933d76acbfc8b23463639ffc82bb58b