Merge "Audio policy: fix HwModuleCollection::getDeviceDescriptor" into qt-r1-dev am: 6d5ee512f5
am: 0132854a2c

Change-Id: I5119723f27364cef4cbe6f2a7b2c3a8aad87e2ba