[automerger skipped] Merge "Track move of timezone classes to libcore.timezone" am: 3ddcb6a90a am: de0bd5321f
am: 18a275efc3  -s ours

Change-Id: I2915f6fad31d2106a6dcc9fd07c3e4897ae2e964