Merge "Move AccessPointPreference to SettingsLib"