[automerger skipped] Merge "Updated PowerAnomalyEvent Proto." into udc-qpr-dev...

[automerger skipped] Merge "Updated PowerAnomalyEvent Proto." into udc-qpr-dev am: 49c4ba78 am: b0822b17 -s ours

am skip reason: Merged-In Id9fa88d6df0db50472732e4a50aa00a7a02db284 with SHA-1 66530d67 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24329537



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