tree 59b6939190652101ccf6a35aa86009272f1e5191
parent ae64e2b7e92fdc4e12ab0285a882c20c0af3ad7f
parent 7a974a5468b8760daeae1890a9c8c52eeed19d87
author Jonathan Scott <scottjonathan@google.com> 1614792375 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614792375 +0000

[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: 7a974a5468

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9030e81f5da23e0502575294d0c73d55cfda973a