Merge mainline-release 6664920 to master - DO NOT MERGE am: 4116ceb8c4

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

Change-Id: I5fe2782b911eda3765e2c209563e3d2ebaf56d8e