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

[automerger skipped] Merge "Add support for app data accounting for in-kernel dataplanes" into sc-dev am: 836927f2 am: 676c0d72 -s ours

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

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

Change-Id: Iabd5e4d24d0137f8d2bb6524f6c460a828cbc14b