[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 69f7bf94be -s ours

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

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

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