Restore backlight brightness after restoring auto ALS mode.

Fixes b/2121632

Change-Id: I14228a4fd1d599de1e5fdbb3c8b4b3c02a1460ac
Signed-off-by: Mike Lockwood <lockwood@android.com>

src/com/android/settings/BrightnessPreference.java

@@ -121,10 +121,11 @@ public class BrightnessPreference extends SeekBarPreference implements
                         mCheckBox.isChecked() ? 1 : 0);
             }
         } else {
-            setBrightness(mOldBrightness);
             if (mAutomaticAvailable) {
                 setMode(mOldAutomatic);
             }
+            // brightness needs to be restored after restoring ALS mode
+            setBrightness(mOldBrightness);
         }
     }