Merge "Fix test failure in MixedDeviceOwnerTest#testSecondaryLockscreen." into sc-dev