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

Change-Id: Iad364bc777c571bac8aa1c31dcdc9e50ed815069