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

Merge "Keep fs_mgr_vendor_overlay_test in internal cf." into main am: ec74e27a am: 668c9591 am: 364cfe96 am: 9b5887f1 am: 3a16b659

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



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