Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev am: 91ceae3ef7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06a257e1c4e660b12dda9f88145d752877706bc2