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

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

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