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

Change-Id: Ie13181902b2e0aaca811323e89d9799b991ae6e2