[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT...

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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a0b376b6e5eb8e75b7c33bca1b8f43a7cb3e57d