[automerger skipped] Merge aosp-24Q3-ts-dev am: 5c156ccc -s ours

am skip reason: Merged-In Id7e103e1f04812c92ee8ecfdfe1e75a9949efa9e with SHA-1 76a4212f is already in history

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



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