Merge changes from topic "cgroup.events2" into main am: 7341ffba am: 44cd6d44 am: 5d9f94d8

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



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