[automerger skipped] Merge "Rewrite the PowerAdvisor using standard power...

[automerger skipped] Merge "Rewrite the PowerAdvisor using standard power wrappers and clean up" into udc-dev am: 3ef28b60 am: 1cdebe87 -s ours

am skip reason: Merged-In I2a11779ce1f78bcf29ea0e7978cb8933e74e9f7b with SHA-1 0538caea is already in history

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



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