[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -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
This commit is contained in:
TreeHugger Robot
2021-06-11 10:25:08 +00:00
committed by Automerger Merge Worker

Diff Content Not Available