[automerger skipped] Merge "Clearing PRIORITY_FLICKER_RR votes on low power...

[automerger skipped] Merge "Clearing PRIORITY_FLICKER_RR votes on low power mode on" into udc-qpr-dev am: 24320109 -s ours

am skip reason: Merged-In Iefe8493c01cb1262509530a4da616f4a15fe18b4 with SHA-1 605ea878 is already in history

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



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