Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into nougat-cts-dev am: c2fc4acf am: 2b77305d am: ee4e3893 Change-Id: I3a29e86db2ca5c5e3f82ccd4785c84c1c91717d3