Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev