[automerger skipped] Merge 24Q3 to AOSP main am: 5698c6c38e -s ours am: a82f5cfaec -s ours

am skip reason: Merged-In Ibf7dda6c4c13d6513e2f08239c95c6b2778a98ec with SHA-1 ebddc4ff3f is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/3258552

Change-Id: I1b246ca1c53bc974ad957bc388a1934bc6a6ad3d
Signed-off-by: Automerger Merge Worker <[email protected]>