Merge "Move getOffset(int, int, int, int, int, int) to ZoneInfo" am: eb70797ee4 am: 4a428deefb am: 77ab4f747a

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

Change-Id: Ic2444087abf6a58f0c927ed4cc4d4d6299d292c8