Merge "Use new package name for ZoneInfo and libcore.timezone" am: af6f8e2301

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

Change-Id: I802ef53df4aa0e047d7883f6ee9d0a37f981119b