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

am skip reason: Merged-In Ic3e4b44bc11016aa96bc232b88cb3b6fbde05a27 with SHA-1 1e26b38b4a is already in history

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

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