Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 am: fac52cd24b am: 3da4638c49

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I159a4a4115f200e78bc368d9db2997c58d0858b8