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

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

Change-Id: I0ec616078dd0a5c2a0b99ad43d8d19169f3a2e1d