Merge "Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14 am: deb64ea13e am: bdebc29751" into oc-dev-plus-aosp