Merge "Revert^2 "remove libbinder_ndk_helper_headers"" into main am: b2653d0b

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



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