Merge "removed obsolete audio policy flags"