am 75d880df: Merge "Revert "Clean up published network condition reporting.""

# Via Android (Google) Code Review
* commit '75d880dfb0bb1342bce0b0337c7ae752d75ff1b6':
  Revert "Clean up published network condition reporting."