Merge "AudioDeviceInventory: reapply preferred device roles when needed" into udc-dev