[automerger skipped] Merge "RESTRICT AUTOMERGE Disable PowerStatsTestsRavenwood" into main am: d670e5c901 -s ours am: 0d4402b410 -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/+/3319034

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