[automerger skipped] Merge "audio policy: fix regression in Audio MMAP device selection" into pi-dev am: 7794b6cdcf
am: e31c558d79  -s ours

Change-Id: I671a1080cf36b28ddd268ea73f95a3537b367dae