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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I792005c9abd7ccf6a0948330a32b2dcc07d51506