Merge changes from topic "cgroup.events2" into main am: 7341ffba

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



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