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

Change-Id: I8f762667e77b633ecbe0962dcbed3c0675e62cf9