Merge "Optionally have ConnectivityService kill sockets for frozen apps" am: 2d626e5632 am: fa5ac120fb

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

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