Merge "Fix flaky UdpEncapsulationSocket test" am: 13078345c5 am: ae9f7b6723
am: 614ab3dd4e

Change-Id: Iad9aea4b42cd8b31a5a2659bb9cb54dd1c64e8b7