Change how we check to see if we should display the progress bar.

Change-Id: I779e229f82a11d570e832f3e8cc5b275939249e8

src/com/android/settings/CryptKeeper.java

@@ -121,7 +121,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
 
         // Check to see why we were started.
         String progress = SystemProperties.get("vold.encrypt_progress");
-        if ("startup".equals(progress)) {
+
+        if (!"".equals(progress)) {
             setContentView(R.layout.crypt_keeper_progress);
             encryptionProgressInit();
         } else {