[automerger skipped] Merge 24Q3 to AOSP main am: 93d8a5e4c2 -s ours am: c46b265351 -s ours

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

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

Change-Id: I8da317c068868c0a7645157ca79ace07c74f8981
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