Merge "Revert "Adapt to libprocessgroup API changes for polling on cgro..."" into main am: 52553becb6 am: 8adb71ff82

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865115

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