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 am: ab8f2b45 -s ours

am skip reason: Merged-In I768907cd3dd2028c7040cddd81fc71a5ce69bbdb with SHA-1 a49bbf06 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191630

Change-Id: I2e30cc835c799af05321f82a55b49ce80b3edcf6