Merge "Fix flaky testNattSocketKeepalives"
am: 296c5ed68d

Change-Id: Ie9fe40e3bcf4187a2e5cbf525bc4e874cff70747