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

am skip reason: Merged-In I002afe0ac6ad47701ae9857fd344a350446aeada with SHA-1 11a86a2f70 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/27906634

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