Backport changes to whitelist sockets opened by the zygote. am: a1252ccbdb
am: abd5b05190  -s ours

Change-Id: I372ab503a353175ff9e7ed49e8c775481f173bd8