Merge "Audio policy: Use surround formats from audio config instead of hardcoded"