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

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

Change-Id: I9e82e9cc1091be0fb9378ce61cc76b23c3781830