Merge "IMM#showInputMethodPickerFromSystem for supporting multi-display."

src/com/android/settings/CryptKeeper.java

@@ -774,7 +774,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             imeSwitcher.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    imm.showInputMethodPicker(false /* showAuxiliarySubtypes */);
+                    imm.showInputMethodPickerFromSystem(false /* showAuxiliarySubtypes */,
+                            v.getDisplay().getDisplayId());
                 }
             });
         }