Merge "Revert "Fix no keyboard on N builds"" into nyc-dev

am: 3ace856

* commit '3ace856ed788349f1e8e343fc6fb4e3bc2a26033':
  Revert "Fix no keyboard on N builds"

Change-Id: I622451e204e0277d9190c6c3ab72b6595b47f6c6

src/com/android/settings/CryptKeeper.java

@@ -799,8 +799,6 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
         // Asynchronously throw up the IME, since there are issues with requesting it to be shown
         // immediately.
         if (mLockPatternView == null && !mCooldown) {
-            getWindow().setSoftInputMode(
-                                WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
             mHandler.postDelayed(new Runnable() {
                 @Override public void run() {
                     imm.showSoftInputUnchecked(0, null);