Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f  -s ours
am: 42cbacbb97

Change-Id: I020e84b3e5dc2f5e5a9a0c5d3dd9f38618cf631a