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

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

Change-Id: I583a872bcb18f1b749f4ab0b49cbc9323920f048