Merge "Revert "audiopolicy: HW Bridge Sink matching rule""