Merge "Fix MixedDeviceOwnerTest test failure" into 24D1-dev