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

Change-Id: Ie3d222f694f3a0ba097fb8674f34e2bd6fc24140