Merge "Remove volume_group conversions from PolicyAidlConversion"