Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-cts-dev...
Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-cts-dev am: 4b2992e9 -s ours am: 92d6d883
am: 10808152
Change-Id: I171282753ed5f1c790515da16b9a58bba7860411