Merge "[Passpoint] Fix connected network not showing in Wi-Fi picker"