Merge "AudioPolicy: fix typos"