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

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

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