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
Change-Id: I07c03beef5044d020390108eadc995f443d6ae9b