Merge "Fix flaky UdpEncapsulationSocket test"
am: 13078345c5

Change-Id: I4d6cc85fcd539a38674fc3daff1af57fa1bdd2f7