[automerger skipped] Merge Android 14 am: 7a2977189d -s ours am: 1f9986b61e -s ours am: e151510365 -s ours am: c52126a7a2 -s ours

am skip reason: Merged-In I9f5d291728c314cab7b1039620a47289832acc7a with SHA-1 35c817ce8d is already in history

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

Change-Id: I4bfb0abf31816ade2b34528d9e946ef86fb6e028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 49e12878ff22c23d42ddc65cb217fc450cd6e6d5
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg