[automerger skipped] Merge "Make sure we'll always kill process group" into...

[automerger skipped] Merge "Make sure we'll always kill process group" into main am: 2ff53e43 am: 4181591e am: f71f4ceb am: 4768467b am: fa4c694d -s ours

am skip reason: Merged-In Id7c7b0dfec432809961042ceba47d7ca1393b968 with SHA-1 00f95558 is already in history

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



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