Merge "Fix binder_sdk build" into main am: 04b3615685

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

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