Merge changes from topic "cgroup.events" into main am: 1b44b8c6

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



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