Merge "[automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf -...

Merge "[automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb0 -s ours am: cd12c662 -s ours" into rvc-d1-dev-plus-aosp am: 81416647 -s ours am: f7657985 -s ours

am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 13fcbce0 is in history

Change-Id: I9d6157eb889027e21944e27c24496b457da62362