Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev