Merge "Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f" into nyc-mr1-dev am: 8e539c7dcd am: d211bc2d61 am: d108cd6a28
am: 4a67228c8f

Change-Id: I7acae726eaeea77f07a51210e05aea6db769a4fa