[automerger skipped] Merge 24Q3 to AOSP main am: 7f1a5a7385 -s ours

am skip reason: Merged-In I9ae3af899655057a07488fee2e085cd1884fcca0 with SHA-1 4e54c82f40 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx/+/3255687

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