Merge "Fix retrofit OTA generation failures" into main am: 9a78be4d

Original change: https://android-review.googlesource.com/c/platform/build/+/3079783



Change-Id: I5696ce46f677bad2a9b1a5c182a7e84d2f814d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>