am a00acd16: Merge "Test changes for the HttpURLConnection fallback strategy"

* commit 'a00acd1600208c9fb74866d7fac94d50ec999464':
  Test changes for the HttpURLConnection fallback strategy