[automerger skipped] Merge 24Q3 to AOSP main am: c36d99e81d -s ours

am skip reason: Merged-In Id95e7fa26e346a4229f7229c9014663cc69b940a with SHA-1 c52c5430a0 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/3258494

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