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

Change-Id: I8e5fe8e23685bbd3521328bff733ae19ab2de29d