Merge "Update attach logic in VolumeEncryptionTest" into mcp/xenial/rocky