Merge "Fix 5405210: DevicePolicyManager doesn't allow Face Unlock"