[automerger skipped] Merge "Merge aosp-24Q3-ts-dev" into aosp-main-future am: 86e299ea -s ours

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

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



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