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

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

Change-Id: Ieb2bd3a55a452fad9e1da8bc3c85e07f5bb2a202