Merge "Make private DNS connect timeout configurable"
am: 918acf867e

Change-Id: Ibb309e80d223e653c024ce45bd2e6cb002822b75