Merge "Merge "Change the icon for the captive portal login app." am: d9614ed849 am: 32f240464c" into qt-dev-plus-aosp