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

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

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