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

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

Change-Id: Ifafe6a340b57ef93000bbceb853f10254ea8f3b4