Merge "Porting from http://r.android.com/453156 to fix...

Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc am: 236c07df am: b9ea2fd3 am: 7d906973 am: 95923506  -s ours am: 7e5b36c8  -s ours am: 648b779e  -s ours am: 7987794c  -s ours am: 929e12af  -s ours
am: cf80fdd0  -s ours

Change-Id: I6347a02540fefe9e7cc8f401e96c1f65df69aef9