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