Merge "AudioPolicyManager: Add more logging for surround formats"