Merge "Keep fs_mgr_vendor_overlay_test in internal cf." into main am: ec74e27a61 am: 668c95919a am: 364cfe9642 am: 9b5887f10e

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

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