Merge "Revert "[DPM] Allow lower strong auth timeout on debuggable builds""