Merge "Revert^4 "remove libbinder_ndk_helper_headers"" into main am: a5744474

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



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