Merge "Keep fs_mgr_vendor_overlay_test in internal cf." into main am: ec74e27a am: 668c9591

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



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