[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard.

USER_CURRENT is not an acceptable input to isSecure(). The test has also
been updated as the use of any() for the mock hid this bug.

Test: atest LockTaskControllerTest
Bug: 176801033
Change-Id: I8aa736bb7b8b60937ad4319e6127c356be5e9b55
(cherry picked from commit acb731f97842b95fc51cc0fc71a61b0f9156b789)
2 files changed