Merge "Correct annotations in ZoneInfoDb" am: 55a61d2f61

Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1486181

Change-Id: Icf30ea789b91e4e0d9e2c808cf641056ab716333