Merge "Do not unmount /mnt/product/* when vold starts" am: 4a625453bf

am: 3d4fb41f3d

Change-Id: I264a9ed62e8c1884e928fe17edd35cf99a382129

VolumeManager.cpp

@@ -624,7 +624,8 @@ int VolumeManager::unmountAll() {
     while ((mentry = getmntent(fp)) != NULL) {
         auto test = std::string(mentry->mnt_dir);
         if ((android::base::StartsWith(test, "/mnt/") &&
-             !android::base::StartsWith(test, "/mnt/vendor")) ||
+             !android::base::StartsWith(test, "/mnt/vendor") &&
+             !android::base::StartsWith(test, "/mnt/product")) ||
             android::base::StartsWith(test, "/storage/")) {
             toUnmount.push_front(test);
         }