[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 70edfdb26a -s ours

am skip reason: Merged-In I52a3723313c2d337cd6dda8a8826d5b64bad4963 with SHA-1 108a9c9eff is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SettingsIntelligence/+/27274119

Change-Id: I0ce892a28a1524205576bda56a3be3b155d0d0f2
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 0338da75cc5dc52af81fec5302d335f35a351bff
  1. res/
  2. src/
  3. tools/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg