Merge "binder: consistent vendor #defines" into main am: 84145b2e07

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

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