Merge "Merge "Close open sockets when enabling firewall rules." into nyc-dev am: b414eb8 am: f35865b" into nyc-mr1-dev-plus-aosp