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

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

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