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

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

Change-Id: Ia052655c445876dc0984897752fc664e1c1db2da