tree 7b939f01d2af3e133efcbcb57add2f5dfe95d7bc
parent 910b875440c7d35b36129ed4106985c42b9ddc31
parent fac52cd24b6f84831dd8e24bbe0401aa25542683
author Ken Chen <cken@google.com> 1610492629 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610492629 +0000

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