Merge "wifi_supplicant: refactor permissions"