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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-qpr-dev am: 27ea4217 am: eb351b55 -s ours am: c1f1a3c8 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2ccd41716042200b59ca2e3c9861274e9025bc0