Merge "Move WallTime out of ZoneInfoData" am: 65d1fda8f6 am: 5dbeacab6b am: 829e31941d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490736

Change-Id: Iee0bcc3e378b6d6a802e884f9a69b1d9ae68d19f