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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d4807349 -s ours am: 65f650b6 am: d2b2ae91 -s ours am: ad4df34c am: b474d2cb am: c9534f61 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I44007722d81abe54262dc4ca4ee25110e8418796