Merge "Add support for app data accounting for in-kernel dataplanes" am: 69e2f04207

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

Change-Id: I2079586851fc48ddaae451d5d5aeb82ba34f2364