Merge "Revert^3 "remove libbinder_ndk_helper_headers"" into main am: 754cf33bce am: 86db967a26

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

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