Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev
am: c1db58bc94  -s ours

Change-Id: I6321ad4bd273771d0ac324681a9a8f69cab3e65a