Merge "WifiInfo: Redact isPrimary for non settings users" into sc-dev