Merge "audio policy: fix legacy Ad2P with advanced codecs"