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: 2d58d83f
Change-Id: I1f7e6a307a49915e1078216ad8e787172c2f0287