Merge "fs_mgr_overlayfs: Revert to use /data only if VAB" am: f9ad588898 am: 0eefdad7ab

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2248333

Change-Id: I0eea3474d86fe1abfb1407f62a671b09fc50f77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>