Merge "Update ZoneInfoTest to avoid dependency on unstable tzdata-testing"