[automerger skipped] Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 7a783de8 am: ca9108da am: 2bb24cca -s ours

am skip reason: Change-Id Ifb5221f3d5a0dee61599ae65800c2cf2218e98ab with SHA-1 17706453 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11985403

Change-Id: If07b2f5150d2e8273d292d398ad4772d607452e3