Merge "libbinder_ndk: add __ANDROID_VENDOR__ error" into main am: a35aa0fe12 am: d6060030dc

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2802638

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