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

[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d2 am: d74f2129 -s ours am: e5c71c69 -s ours am: 2b223ca7 -s ours am: b19991e3 -s ours

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

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

Change-Id: I80faeed053373e407878810adcde2b743bfcad3d