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

Merge "Merge "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" into nougat-mr1-cts-dev am: 6cf2df9f  -s ours" into oreo-cts-dev am: a4764907  -s ours
am: e6686f66  -s ours

Change-Id: I947d66a29f59b2fd8cc47007165da2377bcd186c