Merge "Optionally have ConnectivityService kill sockets for frozen apps" into udc-dev