Merge "Avoid dependency on time-sensitive cache in ZoneInfoDb from TimeZone/ZoneInfo" am: d1d046c235

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1497717

Change-Id: I1bda66767464b428dd742bbca89f2ab4c54cd91e