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

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

Change-Id: Ib0d234e6395f1d78cf2894e68d7cfd692a8dd84d