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

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

Change-Id: I3418e19a26b28624fe607c8c20c2ff12331ed857