Merge "Add a developer option for controlling DNS over TLS"