Merge "Remove ZoneInfoDB.TzData"
am: c1653f40a1

Change-Id: I43dfc17f8c0b4d2ab950621de828d66d9df28796