Merge "AudioDeviceInventory: reset SCO active device upon restore failure" into main