Snap for 6408566 from 3b35589c885719ab8cb1d5ceb81b1c879231779d to mainline-release

Change-Id: I2207381a93c86a137ff2979067d2984e54df416e
diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp
index 58a3139..99f3c5d 100644
--- a/recovery_utils/roots.cpp
+++ b/recovery_utils/roots.cpp
@@ -157,8 +157,8 @@
   bool needs_projid = false;
 
   if (volume == "/data") {
-    needs_casefold = android::base::GetBoolProperty("ro.emulated_storage.casefold", false);
-    needs_projid = android::base::GetBoolProperty("ro.emulated_storage.projid", false);
+    needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false);
+    needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
   }
 
   // If there's a key_loc that looks like a path, it should be a block device for storing encryption