Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc94 am: 236c07dfbd am: b9ea2fd3cc am: 7d90697304 am: 959235067e  -s ours am: 7e5b36c85c  -s ours am: 648b779e85  -s ours am: 7987794c59  -s ours am: 929e12afe9  -s ours am: cf80fdd066  -s ours am: 93da99364a  -s ours
am: d4f1eeae5c  -s ours

Change-Id: I10fb310d364da0b5a729af9b6eb3f23e69c8d6d6