[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83234b1a9f929653c3d221d86101831236ea7bf2