Merge "Use __ANDROID_VENDOR_API__ for vendor API surface" into main