Merge "Remove mentions of audio_policy.conf"