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

Change-Id: I16ab64f6955031bfced51e8049f96f95033624ef