Merge "Revert^3 "remove libbinder_ndk_helper_headers"" into main am: 754cf33b

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



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