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

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

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