[automerger skipped] Merge "audio policy: fix regression in Audio MMAP device selection" am: 8c545704ea
am: a96815b7ec  -s ours

Change-Id: Id649c1dec050db47bfef779f3b0d673a4a580829