Merge "Fix tapas for git_main builds" into main am: 3006f169 am: 68f74898

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



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