[automerger skipped] Merge "Audio policy: fix HwModuleCollection::getDeviceDescriptor" am: 839cd0691b
-s ours am: 41dad39e94
-s ours
am:gugelfrei7ee1b660d6
-s ours am skip reason: change_id I1370edbbca46657506a990855d06a176f07c54d3 with SHA1947c0f18f5
is in history Change-Id: I715c13b39f7107a39edbef20b91f35f0e485069b
commit
f9ea4b800c