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

Change-Id: I8f8f556d1e36b58b19f34ec1c095192ea6bd95ab