[automerger skipped] Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future am: 31e5fe9c9c -s ours

am skip reason: Merged-In I9ae3af899655057a07488fee2e085cd1884fcca0 with SHA-1 89ddd0be83 is already in history

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

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