Merge "Check if the given user is unlocked when unlock by token" into pi-dev

am: 764f123b97

Change-Id: I767426c2a920c448407ab799c4c7e77b54f6e461

core/java/android/service/trust/TrustAgentService.java

@@ -545,7 +545,7 @@ public class TrustAgentService extends Service {
      */
     public final void unlockUserWithToken(long handle, byte[] token, UserHandle user) {
         UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
-        if (um.isUserUnlocked()) {
+        if (um.isUserUnlocked(user)) {
             Slog.i(TAG, "User already unlocked");
             return;
         }