Merge "check thread group leader before killing process" into main am: 23d9f8c2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3408940



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