Merge "Define __ANDROID_VENDOR_API__ for product variants" into main am: af8eb077e6

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

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