am 99189120: Merge "Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""" into lollipop-mr1-cts-dev

* commit '99189120cb4444cc196251961234ed8642534644':
  Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""