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
am: 07af9af8
Change-Id: I5b9bce7b0db85bc0ad1a447879a26e452bd3b74b