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

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

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