Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-mr1-dev