Merge "Kill services even when cgroups is disabled" am: 5c3e24816d am: 18a41fbf65 am: 916f52d74d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2305473

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