[automerger skipped] Merge "SF: Fix pacesetter promotion for folded mirroring"...

[automerger skipped] Merge "SF: Fix pacesetter promotion for folded mirroring" into 24D1-dev am: c444764a -s ours

am skip reason: Merged-In Id5cb29c3cbaa8ed455a15d8be3a32e79a470cce5 with SHA-1 3ff44c7e is already in history

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



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