Merge "Fix type of android_thread_func typedef" into main am: c908a970 am: 64772590

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3257312



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