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

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

Change-Id: Id55e6765cabd637e778012af793f13720dbd923f