Merge "Fix the cgroup v2 thread path" am: 22e18082d1 am: e2a1fda11e am: 44e70ba2cd

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

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