Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev
automerge: 34d183b

* commit '34d183b404333627266d568e905a60e2be3a06f3':
  Revert "Changes associated with an OkHttp bad proxy response fix"