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

Change-Id: I6ce46b76d20d8cad5badb5fd3714c42a70988a06