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

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

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