Merge "Enforce mSettingsLock for WificondScannerImpl"