Merge "libbinder_ndk: add __ANDROID_VENDOR__ error" into main am: a35aa0fe12 am: 01be55cb61

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

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