Merge "Improve DevicePolicyManagerTest for secondary user"