Backport changes to whitelist sockets opened by the zygote. am: 63545150c2
am: 3ca7daccf5

Change-Id: If505b1de8d13465bf2f136304442518104366041