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

Merge "Add support for app data accounting for in-kernel dataplanes" am: 69e2f042 am: cdb9503a am: 9c66126e am: a4e2cdd3

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

Change-Id: I4aaf874248f6a04f3444d6e800bc2027ea43f2cc