This also fixes the issues related to explicit connection to passpoint AP, and fixes occassional mention of 'connected via Wi-Fi Assistent' Change-Id: I152cebafa6259194f1d09a6972a3508156335cb6 (cherry picked from commit ff783cd6cfc82870a6126fe1ef019d21131423fc)