Merge "Fix audio policy configuration for generic targets" into oc-dev am: 34d8c95fd7
am: 71891cdb3e

Change-Id: I50fe0d246441db9a6fbece919b5cc5a47470fc80