GitLab

Changes:
Add one second grace period For LockScreenIfRequired. Basically, an one second OneShotTimer is used to set/reset the behavior.

BUG=633304
BUG=680509
TEST=device test, and modify test coverage

Review-Url: https://codereview.chromium.org/2620383003
Cr-Commit-Position: refs/heads/master@{#443254}