[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 1f34e3cfc3 -s ours am skip reason: Merged-In I2e802819614b547e8bf096a446ed48118a795e27 with SHA-1 9108551fd8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/weaver/+/27908428 Change-Id: I85528c4769571a870cb8afb10ec9e4244074e407 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>