[automerger skipped] Merge "Optionally have ConnectivityService kill sockets for frozen apps" into udc-dev am: 1527491017 -s ours am: 1555431153 -s ours

am skip reason: Merged-In I93f174811aef726145a18ea90443ddfc1456478e with SHA-1 7c999d8d4c is already in history

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

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