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