Merge "Audio policy: fix HwModuleCollection::getDeviceDescriptor"