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

Change-Id: Ib64b8f7e777a5779ef7b057cb55bf1b8148e2fa5