Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a am: 177ee386b9 am: b126d7c7c5
am: 1ed0010f95

Change-Id: Ife729bd1af2fab2180f8619d47e5fd996e954481