Merge "audiopolicy: fixup! audiopolicy: HW Bridge Sink matching rule" am: 38b2948cbc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ec894b4ee84c724eb1efa9a2591adfffb8c6c02