[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: 2a7d0124 -s ours am: e6a803cb -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: I97d68cb1fa200ee73b05a3b85b3e066c2836aafa