[automerger skipped] Merge "Close sockets from...

[automerger skipped] Merge "Close sockets from ConnectivityService#setFirewallChainEnabled" into udc-dev am: 21d204b5 am: 7172feff -s ours am: d043e2a9 -s ours

am skip reason: Merged-In I4974293f7c4814f1fce203d0b027d1887c53c41d with SHA-1 13cf5cbe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23206958



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