Merge "Count modifications to user's power allowlist" into udc-dev am: 91355ffc

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



Change-Id: I58eb86625f4b5d5ceab4a94a6d007ffca433a6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>