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

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



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