Merge "Change the icon for the captive portal login app."
am: d9614ed849

Change-Id: I5e70b6fa429ec64bb1902570e1415776f6924f51