Merge "Extend TzLookupGenerator to generate a new file" am: 0a4103ef37 am: d44d5dd375 am: a6af08b4b4

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

Change-Id: I122d1acaca1d3895d02d18f2221a3af636476d65