Merge "Skip the conflict test cases with fixed volume feature" into pie-cts-dev
am: 9bb8d8476f

Change-Id: I291778355904c492f0a2471c1113d1e4fae387a5