Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours am: 6fa8339792
am: c6ced086d1
Change-Id: Ie3699efd33fe53acfd0dff64cbb18e4792a65bf3
This commit is contained in: