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

am skip reason: Merged-In Ia3e13839cd8680a09637c64067bba21b1b74aa2d with SHA-1 ab92c7917f is already in history

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

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