Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc am: e9295560cf am: 19ebec6d36
am: aa9d4135e2

Change-Id: I6e0b1880edf347cbe5d22efbea2a493941c83c07