Merge "Change gid of cgroupskb/<ingress|egress>/stats" am: d04a1ef466 am: 309a21230a

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

Change-Id: Icda2371b29a25bdecf7cb89b1ea5bdac6001b883