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

Merge "Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc  -s ours" into nougat-cts-dev am: 54f94a32  -s ours am: c7b5f345  -s ours am: 8add0d42  -s ours am: 20b648a0  -s ours am: 7b31b878  -s ours
am: b2113c1d  -s ours

Change-Id: I3812351eda42eae64823ba5dd7315d96dfeb11c4