Merge "AudioPolicyManager: Update StreamDescriptor dump to fix warning/build break"