Merge "Backport changes to whitelist sockets opened by the zygote." into...

Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9 am: 47b88a15 am: 7a0c7ab5 am: 45d7b8dd am: c83ca726
am: edabef57

Change-Id: I5e29bcc852b8c3e361ad0c3ba872e8d959ef5717