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

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



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