[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

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

Change-Id: I8ed97b0e1b970c9ec019903563b568dd3a89a0e5