Merge "Fix DevicePolicyManagerTest#testSetSecondaryLockscreenEnabled test." into main