Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-cts-dev
am: 4b2992e9e2  -s ours

Change-Id: Ic3ad897d26fc7d9c28193938b8aab6b1e499ef21