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

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

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