[automerger skipped] Merge 24Q3 to AOSP main am: 1a472c72c9 -s ours am: 22704283d3 -s ours

am skip reason: Merged-In Ia9b103579eea0859212523729a0d2e63b0f1c0fb with SHA-1 a57cc49c32 is already in history

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

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