[automerger skipped] Fix race condition between lockNow() and...

[automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe -s ours am: 208512ae -s ours am: e8f11035 -s ours am: ffdad637 -s ours am: dd894ae8 -s ours

am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c38 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14679730

Change-Id: I3528472bffe27da1a0844f14d59b1416138db062