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