[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 6dc2a00b46 -s ours am: 10aff55529 -s ours

am skip reason: Change-Id Ib6ee2549cbe7a043dc961f50cfab666bf0174ae5 with SHA-1 c97af9685f is in history

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

Change-Id: I81afe3ec422b329d369fa3bfb7fa74a206e25024