Android O MR1 Preview 2 (OPP6.171019.012)
Merge "Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f  -s ours"