Merge "Remove timestamps from sdk_repo zips" into main am: 03760adbee am: 203c8551c6 am: a291b6193c am: 499d0a4bd1

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

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