[automerger skipped] Merge Android 14 am: 24c0be88a8 -s ours

am skip reason: Merged-In I2c25ac813d32aa6b03d1744209963c17cd882ce3 with SHA-1 69d6c42872 is already in history

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

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