tree eb245a3f4bd1ee407d13573318e21184366c3f71
parent 0e56318ddcab4ecac1e092f33ef7372509bdc08d
parent 46e7734295a3696a9ada73ececa819ba40dec117
author Xin Li <delphij@google.com> 1633681758 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681758 +0000

[automerger skipped] Merge Android 12 am: 1d6355c05b -s ours am: 9b7bda8965 -s ours am: 4f19862263 -s ours am: 46e7734295 -s ours

am skip reason: Merged-In I5f79c277a76c4994914c6e7611338dded991644f with SHA-1 bdc59e6355 is already in history

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

Change-Id: Ib738d9c844c494f853ebd96d54793d8818ccc179