Merge "audio vts: update with new audio policy class"