[automerger skipped] Merge 24Q3 to AOSP main am: d218695d68 -s ours am: 5cfb361d4d -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: I947953a7c0925abf0f60be6dc86f6d01344d869b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>