Merge "Backport changes to whitelist sockets opened by the zygote." into...
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b0 am: e5907309
am: 24ffc9ab
Change-Id: I78adbdbbf8ffddfee3cd8b1407415cdf3a4d1b1f