Merge "Captive portal: rotate fallback urls" into oc-dev
am: a622b24d3a  -s ours

Change-Id: I60f1cca6bb834f8f82dd0627c0943f5785a79122