Merge "Fix 2385283: Add DevicePolicyManager calls to LockScreen."