Merge "Remove timestamps from sdk_repo zips" into main am: 03760adbee

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

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