Merge "audiopolicy: HW Bridge Sink matching rule" am: d68950bbc3

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

Change-Id: Id537de741daedbd2d36e259ed6562c95973ff736