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

Change-Id: Id89b88a6b82868c31d4a3163a024f836d1583b04