[automerger skipped] Merge "Track move of timezone classes to libcore.timezone" am: bfd3237eac am: 0f2e3d68be
am: 894b41c3f8  -s ours

Change-Id: I8deec5a9e51a541b71f80d719a398fb9107496ee