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

am skip reason: Merged-In I5793f3fcbd31221a8c47658ad00629bcbf704bc0 with SHA-1 cc43534948 is already in history

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

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