Merge changes from topic "cherrypicker-L78000000960635464:N55900001368285360" into udc-dev

* changes:
  Close sockets from ConnectivityService#setFirewallChainEnabled
  Add test to verify socket close when firewall is enabled