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

Merge "Move vendor module into base_vendor" into main am: c6d30d3b am: b51cfc63 am: 5d571180 am: bb1df6b1

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



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