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