Merge "Add SmallTest annotation to DevicePolicyManagerTest"