[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 9a0608ac21 -s ours am: ae148508d7 -s ours am: 7673990e1c -s ours am: 973688047d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1f0186fbd260fb51aff0c6a5f83c0705784cede3