[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: Ic080eddb04ce9c20ebb6118abe8a48d28c7f67e5
2 files changed