Merge "Move vendor module into base_vendor" into main am: c6d30d3b

Original change: https://android-review.googlesource.com/c/platform/build/+/2758605



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