Merge "Use isCeStorageUnlocked() in AppDataRollbackHelper" into main

    }

    /**

     * @return {@code true} iff. {@code userId} is locked on an FBE device.

     * @return {@code true} iff the credential-encrypted storage for {@code userId} is locked.

     */

    @VisibleForTesting

    public boolean isUserCredentialLocked(int userId) {

        return StorageManager.isFileEncrypted() && !StorageManager.isUserKeyUnlocked(userId);

        return StorageManager.isFileEncrypted() && !StorageManager.isCeStorageUnlocked(userId);

    }

}