Merge "WifiInfo: Redact MAC address if caller does not have location permission" into sc-dev