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

am skip reason: skipped by user jjaggi

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

Change-Id: Id3394c9a610df9c2551ccfddad1126862ab9d393