[automerger skipped] Merge "Remove distro generation code and its mentions." am: 293be908e1 am: eb629bfa6a am: 5c957fdd82 am: 7f24d84f98 am: 2a54bde2e0 -s ours

am skip reason: Merged-In I16df86cf4c63db0481f658ffd65efc00a2a12e88 with SHA-1 819ac378dd is already in history

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

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