Merge "Merge "fix cellular captive portal reevaluation url" am: 88307143e0 am: c0aea2f563 am: e8fb9dae04" into oc-mr1-dev-plus-aosp