Merge "Make the default user the current user (not 0)" into qt-qpr1-dev

package android.testing;

import static org.junit.Assert.assertEquals;

import android.content.ContentProviderClient;

import android.content.Context;

import android.os.Bundle;

import java.util.HashMap;

import static org.junit.Assert.*;

/**

 * Allows calls to android.provider.Settings to be tested easier.

 *

    public Bundle call(String method, String arg, Bundle extras) {

        // Methods are "GET_system", "GET_global", "PUT_secure", etc.

        final int userId = extras.getInt(Settings.CALL_METHOD_USER_KEY, 0);

        final int userId = extras.getInt(Settings.CALL_METHOD_USER_KEY, UserHandle.myUserId());

        final String[] commands = method.split("_", 2);

        final String op = commands[0];

        final String table = commands[1];