Merge "Backport changes to whitelist sockets opened by the zygote." into...
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf am: 447d3798 am: 71e6a6f1 am: 177ee386
am: b126d7c7
Change-Id: I1a22c2863405a477628807c835ef618a83519def