Merge "Revert "Add DeviceConfig permissions to CTS tests.""