Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

Fix build in DevelopmentSettings.java

Change-Id: I8d89fd46482fae8e708398f749e480b8a06f5f03

src/com/android/settings/wifi/WifiDialog.java

@@ -75,6 +75,11 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase {
         }
     }
 
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+            super.onRestoreInstanceState(savedInstanceState);
+            mController.updatePassword();
+    }
+
     @Override
     public boolean isEdit() {
         return mEdit;