Merge changes from topic "updater-c2a-fixes" am: 30e705aefe

Original change: https://android-review.googlesource.com/c/platform/development/+/1714960

Change-Id: If34bf52b82436c315dc8025dbfa6fbcffb605489