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

[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca am: 1f0a6621 -s ours am: 0f735a7b -s ours am: 6d4c2032 -s ours am: 99c8d90b -s ours am: 6f8491a1 -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/+/14673294

Change-Id: I8cf4f7cbc51b8d42cffd2a4c9d1850a8433179a8