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

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



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