Merge "audiopolicy: HW Bridge Sink matching rule" am: d68950bbc3 am: d7214629e1 am: e37dec36cf am: 9be0894411

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

Change-Id: I9ea1a73ed3a79930f978036d2a363ed1f6fe4183