Merge "Use vendor_file for vendor apex root" into main am: 7c22416a am: bd77cece am: ed8f861d

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



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