[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: If7b23426c16f97dccbea1ad7fc0b9f1d39612c2d
(cherry picked from commit 26a90c2b820ba40755f9c28efaad2173133868b5)
2 files changed