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

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

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



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