Merge "audio policy: match attached device to declared devices" into lmp-mr1-dev