[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
This commit is contained in:
Jonathan Scott
2021-04-27 22:14:15 +00:00
committed by Automerger Merge Worker

Diff Content Not Available