[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: bdc59e6355 -s ours

am skip reason: Merged-In I3d2d80ed53c5726a35a7d1ca43cafe9c45c127f4 with SHA-1 5aa4b33fe8 is already in history

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

Change-Id: I42b1782f2788a9d0b958ae269d4f89ca24ab33a4