Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks"