Merge "Increase the maximum exponential backoff for DNS64 queries." am: e477c86203
am: 0ca87dfcd8

Change-Id: Id20545871aee073d5ed3ecc611bb575ca5c6549a