tree 8007afd643cfc8b4144cdaa3c899580f1e083cde
parent 1238f9f6fabf2c8a779d7ae9b2677da9abe85307
parent acb731f97842b95fc51cc0fc71a61b0f9156b789
author Jonathan Scott <scottjonathan@google.com> 1614776557 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614776557 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b7a3110a265c012aec7e49141d4465f8f9d4d22