[automerger skipped] Merge "Use new package name for ZoneInfo and...

[automerger skipped] Merge "Use new package name for ZoneInfo and libcore.timezone" am: af6f8e23 am: 64937407 am: 26ed852e am: 73200701 am: 12d3531a -s ours

am skip reason: Change-Id Id99a345ec024179295063c3644f72c062cb50554 with SHA-1 6c22f6ad is in history

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

Change-Id: Ieb87dda63d5777cc071e5d97e7dd273faa526619