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

Change-Id: Idf28988f014023f04bda3d3ce77a37fc26863469