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