Merge "Add test case for update volume encryption type"