Merge "audiopolicy: Refactor HwModuleCollection"