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

Change-Id: I968b624584cd15292e876e22a5486195421314e4