Merge "Add captive portal info to DhcpClient output" am: e1aa745f9f am: d477534798 am: 7bbb8f1b85

Change-Id: I999e7e993370359fb8f68b0380e61bb8b1aed038