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

Change-Id: Ibffe08f2a70e59a01fc37d9db44ff0e3cfc0a2e3