Merge "Audio policy config: allow vendor to extend module name am: eb488fad65  -s ours am: 6834a7bea7  -s ours" into oc-mr1-dev