Merge "Add support for app data accounting for in-kernel dataplanes" into sc-dev am: 836927f2

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

Change-Id: Ie5d6dc69c87e07a9781785d264437ffd31180b8f