Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" am: b13de64a11
am: bedf92ed24

Change-Id: Ibcbc93be7e0294e6a06976a6222adc8fe95582e7