Merge "audio policy: fix merging error for commit 112b0af8."