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

Change-Id: I02efd97204b99e8cb9fbd1183951ab9835faed49