Merge "Fix replacement time zone ID generation logic" am: 34c79e8076 am: 4be6b86335

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

Change-Id: Ibaba28e9e3a05c822eecc76bff507c780beffab0