Merge "CGROUPV2_CONTROLLER_NAME -> CGROUPV2_HIERARCHY_NAME" into main am: 91d6cf8686

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3211650

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