[automerger skipped] Merge 10952656 am: 7fdf2ee9b1 -s ours

am skip reason: Merged-In I4bfb0abf31816ade2b34528d9e946ef86fb6e028 with SHA-1 5acea1234d is already in history

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

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