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

[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c -s ours am: c3d061d3 -s ours am: c9c98865 -s ours am: aff01722 -s ours am: 333f5c97 -s ours

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

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

Change-Id: I1cffaf405c843438da21d6de7356ee26ef557508