Merge "Make sure we'll always kill process group" into main am: 2ff53e4308 am: 4181591e06

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

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