Merge "Optionally have ConnectivityService kill sockets for frozen apps" into udc-dev am: 1527491017 am: 1691d08849

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23132466

Change-Id: I4954f33a2b707fb611ea7ca69c3480ad0a422005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>