[automerger skipped] Merge "Close sockets from ConnectivityService#setFirewallChainEnabled" into udc-dev am: 21d204b5a1 am: 7172feff10 -s ours
am skip reason: Merged-In I4974293f7c4814f1fce203d0b027d1887c53c41d with SHA-1 13cf5cbe26 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23206958
Change-Id: Iec7db8de0c11354a71fd193c06b16cea0983621b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: