Merge "Add basic pre-upload hooks for system/timezone" am: b864df01a8

Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1737039

Change-Id: I08a0556b44022473136edda4d175e1a5cecd628c