Merge "audio policy: fix regression in A2DP playback"