am 08d9834c: Merge "Occasionally retest for captive portals once detected" into mnc-dev

* commit '08d9834c1bbba5f7dd284ea648e45db8a7db115b':
  Occasionally retest for captive portals once detected