Merge "Fix MixedDeviceOwnerTest test failure" into main