Merge "Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c am: deb64ea1 am: bdebc297" into oc-dev-plus-aosp