[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 648c0345b8 -s ours

am skip reason: Merged-In I6eaf2b19d5af8e929988ac469637e9e20af594d5 with SHA-1 b35a112338 is already in history

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

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