[automerger skipped] Merge "audiopolicy: fixup! audiopolicy: HW Bridge Sink matching rule" am: 38b2948c am: 49f9567e am: c03a75ea -s ours

am skip reason: Change-Id I9eb9de9682624cc18644e0239bda72c2bb5b502c with SHA-1 2725f332 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdc8696fe374e76547a4086914c7591dd0c04690