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

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



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