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

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 am: 809d0239  -s ours am: 19ef8041  -s ours am: 1b086455  -s ours
am: 93d397fa  -s ours

Change-Id: I47df2629c907b3cbeb6b1f20693937cf289cc880