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

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

Change-Id: Iec285dd357d45599ce92fbe04c8959ef2c86feda