[automerger skipped] Merge "Re-enable PowerStatsTestsRavenwood" into main am: b54cc2d5d3 -s ours am: 4a1cf44ac1 -s ours

am skip reason: Merged-In Iefd574dbded8c4ab2e244c4918c26641364a3432 with SHA-1 983461633b is already in history

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

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