Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 am: 45d7b8dd2a am: 2d58d83f86
am: 7fec6a6126

Change-Id: I16879ce9a483c31cbfa94299498436c4c90d91dd