Merge "audio policy: fix regression in Audio MMAP device selection" into pi-dev