Merge "Add MANAGE_WIFI_INTERFACES to the shell permission"