Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev