tree d756a02f41ac08a8ab21b263042765e540d6dac0
parent 466698f9afc2b4930544c07776493d4bce915f24
parent 9271a1731c2cd201a046b8390f8d4d89f42afd33
author TreeHugger Robot <treehugger-gerrit@google.com> 1623410094 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623410094 +0000

[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -s ours am: 9271a1731c -s ours

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

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

Change-Id: Iffcc6c412f7e4e1f5c85eb98e2870bc892e775b5