Merge "Add a method to start the captive portal login app." am: 30f2544f0c
am: f238a96172

Change-Id: Ie42fa5148bc7fcaf5b64b767c06aba9f618c0aa7