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