Merge changes I72734267,I66ef7a72 am: 6ace0c8ba0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2005652

Change-Id: I23ecce1614673146253c000c71701e32c2d9e10c
diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
index 0fe8b01..692c500 100644
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@@ -174,7 +174,7 @@
 
         auto misc_de_path = android::vold::BuildDataMiscDePath(user_id);
         if (!prepare_dir_for_user(sehandle, 0771, AID_SYSTEM, AID_SYSTEM,
-                                  misc_de_path + "/supplemental", user_id)) {
+                                  misc_de_path + "/sdksandbox", user_id)) {
             return false;
         }
 
@@ -210,7 +210,7 @@
 
         auto misc_ce_path = android::vold::BuildDataMiscCePath(user_id);
         if (!prepare_dir_for_user(sehandle, 0771, AID_SYSTEM, AID_SYSTEM,
-                                  misc_ce_path + "/supplemental", user_id)) {
+                                  misc_ce_path + "/sdksandbox", user_id)) {
             return false;
         }