Merge "Add support for tracking PANS data usage" am: dbedad0dd5 am: 16e2ef942a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffa334fef43ad248173703d34864d859668225a1
tree: 48e61b0f753a03875045f7e839abb40bd4ae0a8c
  1. core/
  2. services/