Merge "Return my user id" into main

package com.android.settings.applications.credentials;

import android.os.UserHandle;

import android.os.UserManager;

import com.android.settings.Utils;

import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType;

public class DefaultCombinedPickerPrivate extends DefaultCombinedPicker {

    private static final String TAG = "DefaultCombinedPickerPrivate";

    @Override

    protected int getUser() {

        UserManager userManager = getContext().getSystemService(UserManager.class);

        return Utils.getCurrentUserIdOfType(userManager, ProfileType.PRIVATE);

        return UserHandle.myUserId();

    }

    /** Returns whether the user is handled by this fragment. */