Merge "Revert "AudioPolicyManager: fix closure of output supporting more than on device""