Merge changes from topic "fix_attributes_match"

* changes:
  fix AudioAttributes matching rule in AudioProductStrategy
  Revert "Revert "Mute haptic channels by default.""