[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-cts-dev am: 48fe694ad4  -s ours am: 4d7de1726d am: d635de6f93
am: 0613805b63  -s ours

Change-Id: I9a05b03455a998dbaad9a22096fff72e0d011ce8