audio_policy: squashed update from AriesVE-DevCon-TEAM