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

[automerger skipped] Merge "Close sockets from ConnectivityService#setFirewallChainEnabled" am: 2a97522e am: fea12282 am: a8a39e7e -s ours am: d19afe66 -s ours

am skip reason: skipped by user motomuman

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



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