Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" am: b13de64a11 am: bedf92ed24
am: 763d6ab49b  -s ours

Change-Id: I2af0b7dc0a2048bb5d357080526668f2f3ffb5ef