Merge "Make sure we'll always kill process group" into main am: 2ff53e43 am:...

Merge "Make sure we'll always kill process group" into main am: 2ff53e43 am: 4181591e am: f71f4ceb

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



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