[automerger skipped] Merge "Add support for app data accounting for in-kernel dataplanes" into sc-dev am: 836927f24b -s ours
am skip reason: Merged-In I768907cd3dd2028c7040cddd81fc71a5ce69bbdb with SHA-1 f5eca660c5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191630
Change-Id: I91d095347ced6a4d16af91371ebefdf68577b724
This commit is contained in: