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

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

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