[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: 7a974a54 am: 74100fcc am: daa97df4 -s ours am: e92c3fae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39cba709358d87779297c01e6a2ac435d76aa7ec