[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: fc6912b55c -s ours

am skip reason: Merged-In I33f28fb68f454c9451b7434afe17f9b520c97305 with SHA-1 e0f1bd6141 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/27908424

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