[automerger skipped] Merge "Audio policy: fix HwModuleCollection::getDeviceDescriptor"
am: 839cd0691b -s ours
am skip reason: change_id I1370edbbca46657506a990855d06a176f07c54d3 with SHA1 947c0f18f5 is in history

Change-Id: I7cfc03f5b25b27fb88394f84885c176e7ee5b849