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

Change-Id: I5e29bcc852b8c3e361ad0c3ba872e8d959ef5717