Merge "Change gid of cgroupskb/<ingress|egress>/stats" am: d04a1ef466 am: 33f83598ad am: 851d2d8508

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

Change-Id: I05222b71bad615c554e5e0b4606926c844a84dd4