Merge "Fix binder_sdk build" into main am: 04b36156 am: b6f27d42

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



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