Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev

import android.hardware.input.KeyboardLayout;

import android.os.Bundle;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.Settings.Secure;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment

        implements InputManager.InputDeviceListener {

    private static final int USER_SYSTEM = 0;

    private static final String KEYBOARD_ASSISTANCE_CATEGORY = "keyboard_assistance_category";

    private static final String SHOW_VIRTUAL_KEYBOARD_SWITCH = "show_virtual_keyboard_switch";

    private static final String KEYBOARD_SHORTCUTS_HELPER = "keyboard_shortcuts_helper";

                getContentResolver(),

                new HashMap<>(),

                new ArrayList<>(),

                USER_SYSTEM,

                UserHandle.myUserId(),

                false /* copyOnWrite */);

        mKeyboardAssistanceCategory = Preconditions.checkNotNull(

                (PreferenceCategory) findPreference(KEYBOARD_ASSISTANCE_CATEGORY));

                Secure.getUriFor(Secure.SHOW_IME_WITH_HARD_KEYBOARD),

                false,

                mContentObserver,

                USER_SYSTEM);

                UserHandle.myUserId());

        updateShowVirtualKeyboardSwitch();

    }