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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into qt-dev am: e086a17e am: 67352cf0 -s ours am: 48cb3da7 am: 32765441

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

Change-Id: I2c8830683c7a49847933d2464c6d8baf79f8ede0