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

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

Change-Id: Ibc05766563d21604239a8d1ac81eb49e0bfe6e42