Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14
am: deb64ea13e

Change-Id: I8d9304663e8b5019b65bf048cc7a72e6e9e43043