Merge "Add a global setting to disable DNS over TLS"
am: 4a906c167b

Change-Id: Ie0f5586342b32c9e7c745ab9697b44158a920233