[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 6495ef327f -s ours

am skip reason: Merged-In I2a1b7add6d25d4549ea206ce8299ef6931f0f95f with SHA-1 2e2cdf3632 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/services/+/3258473

Change-Id: Ia62a18324e2571230a4729abb85d08b098040b1b
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 8418631c5ac91671bf71df6dd52557046f497902
  1. builtInServices/
  2. tools/
  3. updatableServices/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg