[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: 51855b1f -s ours am: be14ed48 -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: Ibcd863a88013ec0aac0ad31e88360948ab76f97d