[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: 548ddc79 -s ours am: 648b6b5d -s ours am: bf424a02 -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: Ifaa76a23663e0a0a7387beb1e7daefc021672808