[automerger skipped] Merge aosp-24Q3-ts-dev am: 53b6fae571 -s ours

am skip reason: Merged-In I48189896138da4efacbe1ce8e46f4267e956771f with SHA-1 864c904897 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/28853486

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