Merge "Fix kotlin nullable errors in CompanionDeviceMultiDeviceTests" into main