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

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

Change-Id: I8b099714e8d9f9e449d98567dfd0f3dc6bec5655