Merge "Add OVERRIDE_WIFI_CONFIG permission to Shell for CTS"