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

Backport changes to whitelist sockets opened by the zygote. am: 63545150 am: 3ca7dacc am: 7f0598bc  -s ours am: d210ab92 am: 004a7427 am: 4b638126 am: a1be6fdb am: e05b517d am: 73a7177d am: d215dbe9 am: d5138b58 am: e68d7272 am: 7cf4f672 am: 0c0fc855
am: b0cb96f5

Change-Id: If380a738fe288b5195acd6bacd38498bdee5baea