Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev
am: 6a3eb31763

Change-Id: I40edb775bb09083110767745728356aa7c639d47