[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into qt-dev am: e086a17e7d am: 67352cf086 -s ours am: 48cb3da792 am: 3276544168 am: 5bc4325c38 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0f6b96d502f90e09425fbb6710cae3166111af7d