Merge "audiopolicy: fixup! audiopolicy: HW Bridge Sink matching rule" am: 38b2948c am: 49f9567e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e87cfd82e21e9ae594d54f4a88a2318e4bcd504