tree 70707c563daa0d352f1d94987f75d9d11b853ca6
parent c9534f61b520626075748d84d59d44d02ceae82d
parent 71348ece4f1d50a8c486b3e4ea143a747bc55cb6
author Jonathan Scott <scottjonathan@google.com> 1619561655 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619561655 +0000

[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded379 am: 5af044fcf2 -s ours am: 05bc9eb65d am: 71348ece4f

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

Change-Id: I740d6311b69d45225ba3c3c4cbf0dcb2a52fc022