Merge "Fix CTS test case failure test_isReachableLjava_net_NetworkInterfaceII" into nougat-mr1-cts-dev