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

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



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