[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev am: 91ceae3e am: b06d114a -s ours am: 6d7ef255

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifde959db8773835eeb224b273ba09af10065ae34