Merge "Backport changes to whitelist sockets opened by the zygote." into...
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9 am: 47b88a15
am: 7a0c7ab5
Change-Id: I0ed385ab13ca461c1b77226d3be3cf788a09d3d6