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

Change-Id: I1d5a39cec809f91477e09c8545c6d1173152ea0f