Add Android/data mounting along with obb mounting in vold

We should mount Android/data also, not only Android/obb.

Test: After flag is enabled, AdoptableHostTest still pass.
Bug: 148049767
Bug: 150584566
Change-Id: I26dc3756aa5843b85565495e9c2698130113f49a
Merged-In: I26dc3756aa5843b85565495e9c2698130113f49a
(cherry picked from commit d88e090098d4a95112aecb135d1bcba96150bdd1)
diff --git a/model/EmulatedVolume.cpp b/model/EmulatedVolume.cpp
index c2f92e4..1391685 100644
--- a/model/EmulatedVolume.cpp
+++ b/model/EmulatedVolume.cpp
@@ -127,7 +127,7 @@
     }
 
     if (mAppDataIsolationEnabled) {
-        // Starting from now, fuse is running, and zygote will bind app obb data directory
+        // Starting from now, fuse is running, and zygote will bind app obb & data directory
         if (!VolumeManager::Instance()->addFuseMountedUser(userId)) {
             return UNKNOWN_ERROR;
         }
@@ -135,7 +135,7 @@
         // As all new processes created by zygote will bind app obb data directory, we just need
         // to have a snapshot of all existing processes and see if any existing process needs to
         // remount obb data directory.
-        VolumeManager::Instance()->remountAppObb(userId);
+        VolumeManager::Instance()->remountAppStorageDirs(userId);
     }
 
     return OK;