Merge "AudioPolicyManager: fix closure of output supporting more than on device" am: b1b4ddf70c am: 8e799747de am: dac9e956f0 am: 94af2ae592

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1863726

Change-Id: I3f228a184178478a4067504c44b12d23702517a3