Merge changes I9eb9de96,Id1e037af

* changes:
  audiopolicy: fixup! audiopolicy: HW Bridge Sink matching rule
  Revert "Revert "audiopolicy: HW Bridge Sink matching rule""