Merge "[automerger skipped] Merge "Add support for app data accounting for...

Merge "[automerger skipped] Merge "Add support for app data accounting for in-kernel dataplanes" into sc-dev am: 836927f2 -s ours am: 1fccbf70 -s ours" into sc-v2-dev-plus-aosp