Revert "Schematize vold system properties"

This reverts commit e6baedd917.

Reason for revert: Breaking aosp_master build

Change-Id: I7b171441196326391972cb0b0c45bf11a04f6f1b

src/com/android/settings/MasterClear.java

@@ -39,7 +39,6 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import androidx.annotation.VisibleForTesting;
-import android.sysprop.VoldProperties;
 import android.telephony.euicc.EuiccManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -405,7 +404,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
     }
 
     private boolean isExtStorageEncrypted() {
-        String state = VoldProperties.decrypt().orElse("");
+        String state = SystemProperties.get("vold.decrypt");
         return !"".equals(state);
     }