Revert "Revert "Changes associated with an OkHttp bad proxy response fix""

This reverts commit 11c3934f61c6c873fd9caae16947285bc0068965.

commit 11c3934f61c6c873fd9caae16947285bc0068965 was incorrectly
merged from lollipop-cts-dev into lollipop-mr1-cts-dev.

Change-Id: I66fa65f08397fb34d6af1cb73d2c0fa7f57ef1b6
1 file changed