cleaned up audio policy

Change-Id: I0a073711672d198460d2952f3de6213549b314dd